From: Linus Walleij <linus.walleij@linaro.org>
Date: Wed, 3 Apr 2013 20:18:36 +0000 (+0200)
Subject: Merge tag 'v3.9-rc5' into devel
X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~8995^2~20
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=6a7b3e970426f4bc2a8d52f81a4fda6595a9f052;p=linux-4.9.git

Merge tag 'v3.9-rc5' into devel

Linux 3.9-rc5

Conflicts:
	drivers/pinctrl/pinconf.c
---

6a7b3e970426f4bc2a8d52f81a4fda6595a9f052